Fix extra comma error in list of projects #111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@olivergondza, please, review :) |
|
Looks, good to me (https://github.com/jenkinsci/parameterized-trigger-plugin/pull/111/files?w=1) but is missing tests. |
olivergondza
approved these changes
Dec 26, 2016
|
@kwhetstone, can you merge, please? |
| return FormValidation.error(Messages.BuildTrigger_NotBuildable(projectName)); | ||
| } | ||
| if (StringUtils.isBlank(projectName)) { | ||
| return FormValidation.error(Messages.BuildTrigger_NoSuchProject(" ", "?")); |
There was a problem hiding this comment.
I would rather return another warning ("Blank job name in the list")
There was a problem hiding this comment.
All other messages are using hudson.tasks.Messages from core. And most of them are localized. Is it ok to put custom message? It could break user's expectations.
There was a problem hiding this comment.
It's a new message, so IMHO it's fine. Jenkins core just skips such empty lines without any message:
public static <T extends Item> List<T> fromNameList(ItemGroup context, @Nonnull String list, @Nonnull Class<T> type) {
final Jenkins jenkins = Jenkins.getInstance();
List<T> r = new ArrayList<T>();
if (jenkins == null) {
return r;
}
StringTokenizer tokens = new StringTokenizer(list,",");
while(tokens.hasMoreTokens()) {
String fullName = tokens.nextToken().trim();
if (StringUtils.isNotEmpty(fullName)) {
T item = jenkins.getItem(fullName, context, type);
if(item!=null)
r.add(item);
}
}
return r;
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Right now user can provide list of project with extra comma. I.e.
"projectA, "And verification passes.
But after execution user receives:
It happens because in
TriggerBuilder.javawe have check like this:And as result number of tokens are bigger than number of projects (because we skipped empty one before). So, I adjust this check with the most earliest existed check I found.